From: Jim Blandy <jimb@redhat.com>
Date: Thu, 20 May 1993 23:15:17 +0000 (+0000)
Subject: Fix the fix to scrollbar computaaFix the fix to the fix for scrollbar computation.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~96131
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=8a9311d7078206cf179ce59503ac468bb1bd6454;p=emacs.git

Fix the fix to scrollbar computaaFix the fix to the fix for scrollbar computation.
---

diff --git a/src/xdisp.c b/src/xdisp.c
index f034bb203e6..b991aeb5805 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -1069,14 +1069,14 @@ done:
       if (! MINI_WINDOW_P (w)
 	  || (w == XWINDOW (minibuf_window) && ! echo_area_glyphs))
 	{
+	  whole = ZV - BEGV;
 	  start = startp - BEGV;
 	  /* I don't think this is guaranteed to be right.  For the
 	     moment, we'll pretend it is.  */
-	  end = Z - XINT (w->window_end_pos) - BEGV;
-	  whole = ZV - BEGV;
+	  end = (Z - XINT (w->window_end_pos)) - BEGV;
 
 	  if (end < start) end = start;
-	  if (whole > (end - start)) whole = end - start;
+	  if (whole < (end - start)) whole = end - start;
 	}
       else
 	start = end = whole = 0;